* progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4dc36245f23ad6c65b6e1ba773d751bd4acd6b5..41b53a0c37578c0a643a1bb1544e5899821a4641 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-31  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/cc-vars.el (c-make-macro-with-semi-re): Silence compiler.
+
 2013-05-31  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p): New

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index f830cc7edc1606b5303879fafe35cdd85c8eeaef..f97e8d1483b43bcbed4956f5d354e4aa5e16550f 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1645,6 +1645,7 @@ and is likely to disappear or change its form soon.")
   ;; `c-macro-with-semi-re' (or just copy it if it's already a re).
   (setq c-macro-with-semi-re
        (and
+        (boundp 'c-opt-cpp-macro-define)
         c-opt-cpp-macro-define
         (cond
          ((stringp c-macro-names-with-semicolon)